Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

v1.16: Prune programs deployed in duplicate unconfirmed slot (backport of #32999) #33003

Merged
merged 1 commit into from
Aug 25, 2023

Conversation

mergify[bot]
Copy link
Contributor

@mergify mergify bot commented Aug 25, 2023

This is an automatic backport of pull request #32999 done by Mergify.
Cherry-pick of dbe4017 has failed:

On branch mergify/bp/v1.16/pr-32999
Your branch is up to date with 'origin/v1.16'.

You are currently cherry-picking commit dbe4017143.
  (fix conflicts and run "git cherry-pick --continue")
  (use "git cherry-pick --skip" to skip this patch)
  (use "git cherry-pick --abort" to cancel the cherry-pick operation)

Changes to be committed:
	modified:   program-runtime/src/loaded_programs.rs

Unmerged paths:
  (use "git add <file>..." to mark resolution)
	both modified:   core/src/replay_stage.rs

To fix up this pull request, you can check it out locally. See documentation: https://docs.github.com/en/github/collaborating-with-pull-requests/reviewing-changes-in-pull-requests/checking-out-pull-requests-locally


Mergify commands and options

More conditions and actions can be found in the documentation.

You can also trigger Mergify actions by commenting on this pull request:

  • @Mergifyio refresh will re-evaluate the rules
  • @Mergifyio rebase will rebase this PR on its base branch
  • @Mergifyio update will merge the base branch into this PR
  • @Mergifyio backport <destination> will backport this PR on <destination> branch

Additionally, on Mergify dashboard you can:

  • look at your merge queues
  • generate the Mergify configuration with the config editor.

Finally, you can contact us on https://mergify.com

@mergify mergify bot added the conflicts label Aug 25, 2023
* Prune programs deployed in duplicate unconfirmed slot

* unit test

(cherry picked from commit dbe4017)
@pgarg66 pgarg66 added automerge Merge this Pull Request automatically once CI passes and removed conflicts labels Aug 25, 2023
@mergify mergify bot merged commit cc5e897 into v1.16 Aug 25, 2023
18 checks passed
@mergify mergify bot deleted the mergify/bp/v1.16/pr-32999 branch August 25, 2023 19:04
@codecov
Copy link

codecov bot commented Aug 25, 2023

Codecov Report

Merging #33003 (cc9a5b2) into v1.16 (f1100ba) will increase coverage by 0.0%.
Report is 1 commits behind head on v1.16.
The diff coverage is 100.0%.

@@           Coverage Diff           @@
##            v1.16   #33003   +/-   ##
=======================================
  Coverage    81.9%    82.0%           
=======================================
  Files         762      762           
  Lines      208078   208136   +58     
=======================================
+ Hits       170598   170676   +78     
+ Misses      37480    37460   -20     

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
automerge Merge this Pull Request automatically once CI passes
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants